bitkeeper revision 1.1713.1.12 (42b0da31QIvTtfE2iHo4yER4A1GFIw)

serial.c:
  Fix serial_getc locking.

diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c
index bec789e084fc21bd78c4282fc792aeaa8805d842..ad5ad5cde0cdf75c3da9a9de87b580729abba6a4 100644 (file)
--- a/xen/drivers/char/serial.c
+++ b/xen/drivers/char/serial.c
@@ -176,11 +176,15 @@ char serial_getc(int handle)
             if ( port->rxbufp != port->rxbufc )
             {
                 c = port->rxbuf[MASK_SERIAL_RXBUF_IDX(port->rxbufc++)];
+                spin_unlock_irqrestore(&port->lock, flags);
                 break;
             }
             
             if ( port->driver->getc(port, &c) )
+            {
+                spin_unlock_irqrestore(&port->lock, flags);
                 break;
+            }
 
             spin_unlock_irqrestore(&port->lock, flags);